[AUTO-CHERRYPICK] Upgrae rust to 1.96.1 and integrate with kata-containers-cc - branch 3.0-dev - #18631
Merged
Merged
Conversation
(cherry picked from commit 4a21ab0)
azurelinux-ci-jwt-app
Bot
added
the
Auto Fast-track Cherry-pick
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.1.1 | 3.1.1 | 3.1.1 |
| Release | 12 | 11 | 12 |
| Patches | 1 | 1 | 1 |
| Conflict | Yes |
- Version-release 3.1.1-12 is not higher than Source 3.1.1-12
kata-containers-preview SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.27.0~preview2 | 3.27.0~preview2 | 3.27.0~preview2 |
| Release | 2 | 1 | 2 |
| Patches | 2 | 0 | 2 |
| Conflict | Yes |
- Version-release 3.27.0
preview2-2 is not higher than Source 3.27.0preview2-2
ripgrep SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 13.0.0 | 13.0.0 | 13.0.0 |
| Release | 14 | 13 | 14 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 13.0.0-14 is not higher than Source 13.0.0-14
rust-cbindgen SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 0.24.3 | 0.24.3 | 0.24.3 |
| Release | 12 | 11 | 12 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 0.24.3-12 is not higher than Source 0.24.3-12
tardev-snapshotter SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.2.0.tardev1 | 3.2.0.tardev1 | 3.2.0.tardev1 |
| Release | 10 | 9 | 10 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 3.2.0.tardev1-10 is not higher than Source 3.2.0.tardev1-10
clamav SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.5.4 | 1.5.4 | 1.5.4 |
| Release | 2 | 1 | 2 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 1.5.4-2 is not higher than Source 1.5.4-2
cloud-hypervisor SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 51.1.101 | 51.1.101 | 51.1.101 |
| Release | 3 | 2 | 3 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 51.1.101-3 is not higher than Source 51.1.101-3
kata-containers-cc SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.15.0.aks0 | 3.15.0.aks0 | 3.15.0.aks0 |
| Release | 18 | 18 | 18 |
| Patches | 9 | 12 | 13 |
| Conflict | Yes |
- Version-release 3.15.0.aks0-18 is not higher than Source 3.15.0.aks0-18
- Version-release 3.15.0.aks0-18 is not higher than Target 3.15.0.aks0-18
- Unresolved conflict markers (<<<<<<< / >>>>>>>) found in file
- Duplicate changelog entry for 3.15.0.aks0-18 (appears 2 times)
- Duplicate changelog entry for 3.15.0.aks0-17 (appears 2 times)
kata-containers SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 3.32.0.kata0 | 3.32.0.kata0 | 3.32.0.kata0 |
| Release | 4 | 3 | 4 |
| Patches | 5 | 5 | 5 |
| Conflict | Yes |
- Version-release 3.32.0.kata0-4 is not higher than Source 3.32.0.kata0-4
- Changelog out of order: 3.1.0-10 appears before 3.1.3-1
python-cryptography SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 42.0.5 | 42.0.5 | 42.0.5 |
| Release | 6 | 5 | 6 |
| Patches | 4 | 4 | 4 |
| Conflict | Yes |
- Version-release 42.0.5-6 is not higher than Source 42.0.5-6
rust-bootstrap SPEC summary
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.95.0 | None | 1.95.0 |
| Release | 1 | None | 1 |
| Patches | 0 | 0 | 0 |
| Conflict | Yes |
- Version-release 1.95.0-1 is not higher than Source 1.95.0-1
- Version-release 1.95.0-1 is not higher than Target None-None
microsoft-github-policy-service
Bot
added
specs-extended
This was referenced Aug 31, 2026
|
Copilot resolve merge conflicts |
Copilot started work on behalf of
Kavya Sree Kaitepalli (KavyaSree2610)
September 1, 2026 09:24
View session
…ck-pr-18628-to-3.0-dev # Conflicts: # SPECS/cloud-hypervisor/cloud-hypervisor.spec # SPECS/kata-containers-cc/kata-containers-cc.spec Co-authored-by: KavyaSree2610 <92566732+KavyaSree2610@users.noreply.github.com>
Contributor
Merged
Note: the previous cherry-pick commit had left unresolved conflict markers in |
Kavya Sree Kaitepalli (KavyaSree2610)
approved these changes
Sep 1, 2026
Kavya Sree Kaitepalli (KavyaSree2610)
added
the
ready-for-stable-review
jslobodzian
approved these changes
Sep 1, 2026
jslobodzian
marked this pull request as ready for review
September 1, 2026 15:22
jslobodzian
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an auto-generated pull request to cherry-pick commit 4a21ab0 to 3.0-dev. Original PR: #18628
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.